Bug: 76692459 Test: make Shell Change-Id: If11159cac1bd5aa61c46a346647b97a661abbf11 Merged-In: If11159cac1bd5aa61c46a346647b97a661abbf11 (cherry picked from commite92135a6e9) (cherry picked from commit474df059db) (cherry picked from commite0efaddbeb)