am d428e48a: merge from open-source master
This commit is contained in:
committed by
Android Git Automerger
commit
58f6c80ad8