Merge "Fix dependency on APK used by test" am: 85d2ac2e12
am: 6bbd7c4cc6

Change-Id: Iafa0383ba571d4c72e37ca7f2b68f1cb7a0bc025