Test: manual Change-Id: I8a1034d7131905463749d5b131dd9a3c8703fe96
Test: adb install --incremental <apk> Change-Id: I74e3eaf9718a16272bc533bc8298dfcf81120caa