Added opportunity to set extra user options.

Change-Id: I191eca8806f92c84896e776ddc8b9263f00947ae
Related-PROD: PROD-28027
(cherry picked from commit a0b79e20af97a54a24e64724d3a3feb81ef28791)
7 files changed