Reported in review D30333 MFC after: 1 week (cherry picked from commit 5d698386fb)
5d698386fb
31070b5bc7