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

Change-Id: Id82ce73849059e7792422023afc66cba13833ecc