[automerger skipped] [DO NOT MERGE] Disable optimizing compiler for pac file am: 779c011de1 am: 9fbde65b37 am: 57beb3452a -s ours am: d9cb52a6fc -s ours
am: 4da78c5666

Change-Id: Icf7fa9419ecf93128efee855c0cb5b080ec27323