Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 05a93307bd am: 77621aa9cb
am: b3ae71db5c

Change-Id: I6e9876cf1c30a6c2a666229447cbc4a744e5a9bf