[ Merge of http://go/wvgerrit/152510 ] Bug: 236317198 Change-Id: I67ac7d7c903ecfbb659595699c5bfe38f4d781df