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

Change-Id: Ic29843ba26e6bab7cd285cde30f7572af920090a