[automerger skipped] Merge "Disable view compiler for protected storage" am:...
[automerger skipped] Merge "Disable view compiler for protected storage" am: e396fe4a am: 03cc6bcc
am: 09d19b99 -s ours
am skip reason: change_id Id386ebd1be7329ab1ea9657187dfbabb4f1bf73c with SHA1 c8aa8ff3 is in history
Change-Id: I109befb8519a910cfe6f4f6440a45dd9e64c16b3