[automerger skipped] Merge "Disable view compiler for protected storage" am: e396fe4a02 am: 03cc6bccf7
am: 09d19b99ed -s ours
am skip reason: change_id Id386ebd1be7329ab1ea9657187dfbabb4f1bf73c with SHA1 c8aa8ff300 is in history

Change-Id: I109befb8519a910cfe6f4f6440a45dd9e64c16b3