Merge remote-tracking branch 'aosp/upstream-master' into update
am: 19766b680b

Change-Id: Ibef9e08fbc2d32ba2db8bbfa574bf5e871fc4a2b