Bug: 149849077 Test: N/A Change-Id: Id8b5dd13e87d1acd8dab1431fa6859721553c49c (cherry picked from commit 3125c990)