Bug: 138441555 Test: Manual Change-Id: Ie8ea452b58315a2ae0844939a3c8de7665dda851 (cherry picked from commit b22e8111)