Merge commit 'bbc9221' into master This merges the history from upstream without making any changes to the code. Bug: 33280507 Change-Id: I303a906c2cb361cdc2b9a6c99da2b09782467254 (cherry picked from commit 5e48fb0cc42f4c09080930e5c5ded1ef4bc89eed) (cherry picked from commit d4aea7c865084a140a965d4c413c6c38f9a2743a)