Merge commit '990179755525d01a7e005182d8ec04722c7fd396' * commit '990179755525d01a7e005182d8ec04722c7fd396': a possible fix for the bug http://b/issue?id=2200637
Merge commit '990179755525d01a7e005182d8ec04722c7fd396' * commit '990179755525d01a7e005182d8ec04722c7fd396': a possible fix for the bug http://b/issue?id=2200637