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

Change-Id: Iad229c92b78765e591ec9cf8af07f61de9e2807d