bf0d1ad72b
Merge from internal master. (cherry-picked from commit 6ffaa931c362602a2b606a610c92326a425a876e) Change-Id: Ifdcf01fd122866cf0d4c5b5f7a997803561d7889