Merge "Choose options format using property" am: 479588c68e

Change-Id: I67523617a54957da6a3fae7cd9233ff47627578d