Bug: 110476897 Test: local Change-Id: Ifdc26498f8dd3597b49678476f8378edb23bb243 Merged-In: Ifdc26498f8dd3597b49678476f8378edb23bb243 (cherry picked from commit 5020a66d)