Merge "APK Cache Demo App" am: cd3a0fe97c
am: 09408cb0e6

Change-Id: I04a47027504c8e6c7c292ee940ba11fe082fac20