Merge "Force APKs to be streamed" into nyc-dev am: dd100f4298 am: bafabbe4b9 am: 83410b7f31 am: 2575de957d
am: 02f95f0c7e

Change-Id: Id1cb2ed85be58cebab341d45192abb26295368d9