Bug: b/64399219 Test: Manual Change-Id: I4f6c7e4e3339ae95e43299bf364edff40d07c796 (cherry picked from commit c8bd93d7e8)
c8bd93d7e8