796cbe249b
Merge from internal master. (cherry-picked from commit 7ffad9c120054eedebd5f56f8bed01144e93eafa) Change-Id: Ia67f2a545399f4fa37b63d5634a3565e4f5482f9