[ Merge of http://go/wvgerrit/151570 ] Bug: 215590138 Bug: 236317198 Change-Id: I5e90d2813252ca5ff5d9ba62316e2ee5545c71bf