Commit 3dd0cd51cead6c45117c0f067d35390eb9746621

Kentaro Fukuchi 2018-06-03T00:05:39

Cherry-picked 62538e.