Merge remote-tracking branch 'aosp/upstream-master' am: 2e5b55c9a2

Change-Id: I802415c6766e240fda4a4b63f23f8ad852daa0cf