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

Change-Id: I31493324e3bea03b34a4f4115e46dcfd23cc42f2