Merge changes from topic "ota_dexopt_no_ampersand"
am: 48b50991ec

Change-Id: I7fb29d916a753682807844473e98f48f7ab6eea0