[automerger skipped] Prevent apps from causing presubmit failures am: a68dd136aa -s ours am: e86ab0d319 -s ours

am skip reason: Change-Id If87b9683e5694fced96a81747b1baf85ef6b2124 with SHA-1 607bc67cc9 is in history

Change-Id: I168b9d55a0771c821ecc889661f58864a83ac91c