Will be exposed/reworked on in S.
Test: basic sanity
Bug: 147921202
Merged-in: Iab4974f9cd7cecde1ef6eba35c320101a288b481
Change-Id: Iab4974f9cd7cecde1ef6eba35c320101a288b481
(cherry picked from commit 13a8d14fcd)
Will be exposed/reworked on in S.
Test: basic sanity
Bug: 147921202
Merged-in: Iab4974f9cd7cecde1ef6eba35c320101a288b481
Change-Id: Iab4974f9cd7cecde1ef6eba35c320101a288b481
(cherry picked from commit 13a8d14fcd)