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

Change-Id: Ie9aeb7c2939e9a7c5b0444182205a087da2e3bd6