Bug: 79428110 Test: Manual Change-Id: Ie77128f447ad0628336b2af38344d2d7a07f1eab Merged-In: Ie77128f447ad0628336b2af38344d2d7a07f1eab (cherry picked from commit a77d9d7f)