Merge "Choose options format using property" into rvc-dev am: 0fbd0c1542 am: a46dc6fe7a

Change-Id: I73ae34a24775ac62d5fc11c901b932ad0adb50a2