Merge "Fix dependency on APK used by test" am: 58f4f023cb am: 2e2b5ec42e am: 8b91b93a53 am: 8204a0fb20
am: d32cb3a747

Change-Id: I890346b6bb924904c9237b85b65d54476a2bc2a7