Merge \"remove apk\" into nyc-dev
am: c11190bc76

Change-Id: Ia90dce0803f2fc18682ef8fd3444be18062aff50