(This is a merge of http://go/wvgerrit/83324) Bug: 134116645 Test: Build Change-Id: I813381437201b9e7842ba491c36d58c9be4efdda
(This is a merge of http://go/wvgerrit/83324) Bug: 134116645 Test: Build Change-Id: I813381437201b9e7842ba491c36d58c9be4efdda