am 4d3a15be: Merge change 8554 into donut
Merge commit '4d3a15be83dae30fe6e98844c83e5b97a0ec4fed' * commit '4d3a15be83dae30fe6e98844c83e5b97a0ec4fed': AI 150122: Merge from donut.
This commit is contained in:
committed by
Android Git Automerger
commit
dea940387e