Further lock down app data am: 0b67bb88e5
am: 90e1c5bfdb

Change-Id: Ia86cfc207ca4617e334f87ee088582f86db4e2b8