Merge "Fix dependency on APK used by test" am: 85d2ac2e am: 6bbd7c4c am: 2f621549 am: a88f18a5 am: 02550476 Change-Id: I31493324e3bea03b34a4f4115e46dcfd23cc42f2