Merge "Force APKs to be streamed" into nyc-dev am: dd100f4298
am: bafabbe4b9

Change-Id: I0ff901eb1b123a21a425072439c8be9dcd66ae6a