Merge changes from topic "am-19343408044c4969a6a5d04724c92f81"

* changes:
  Merge changes from topic "ota_dexopt_no_ampersand" am: 48b50991ec am: 083bb197bb am: 5a986342cd
  OTA Dexopt: Remove old '&' path am: c260c96b5c am: 188615ead6 am: b030bf0f94