Merge "Disable view compiler for protected storage" am: e396fe4a02
am: 03cc6bccf7

Change-Id: Ib74e690dd8f19736718b54b5f4436618d9a62ae2