am 438e7827: am af4802a2: am d64910c4: am cd145285: Second half of workaround for all apps crash in restricted profile

* commit '438e7827f547ea1629d2199525a72a30618a8ece':