(Cherry-picked from 2f777b39) Bug: 149663536 Test: m Merged-In: Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8 Change-Id: Ia233ca642d58b7b6a0984359ea11958f8d9a8ff8