Merge changes from topic "ota_dexopt_no_ampersand" am: 48b50991ec am: 083bb197bb
am: 5a986342cd

Change-Id: I6f7a2d12e107c39950974d48cdf8a165d0e8a2f5