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

Change-Id: Ie37ad748e20b1337a8cd63fd06db1d01583e9c72