Added extra options for users

Change-Id: I26b20f5946033e98f1323437e40a52f0e96fe873
Related-PROD: PROD-28027
(cherry picked from commit a1986d42b139d5664cc0685d7584325661422307)
2 files changed