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

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

Change-Id: Iac47b126d3ca73cfd60adfb18d3e52be916af98b