Merge "Force APKs to be streamed" into nyc-mr1-dev
am: 7c9aaa6ef6

Change-Id: Iea0b7f72bbce7cfccb796a9091aeeece9e493953