Bug: 78133793 Test: Builds and ran unit tests. Change-Id: I3e15e402dcc367ecea426895ec8e666887832e8d (cherry picked from commit a128c5cb)