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