Merge remote-tracking branch 'aosp/upstream-master' into aosp/master am: f7ec9f65d4 am: ee72ae81b0
am: 3c7aa0780a

Change-Id: If141de85c596e61a2483c344ac23436969e7535e