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

Change-Id: I6584054bc2de2b9bd37532c0f0577c63ed59e83c