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

Change-Id: I0bfeac966366c6c6eace47b79470f2e0e798adc6