Merge "remove apk" into nyc-dev