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

Change-Id: I3b4a7351dc9e1052a590f610dd6b769ba297667a