Merge "Force APKs to be streamed" into nyc-dev am: dd100f4298 am: 03389b70df
am: 693dab4758

Change-Id: I10c5436b58da73c9140e887fa836a88e378ede43