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

Change-Id: Ic1904dab79ee0cccdc1aace7eca89d9a6cb48f4f