Bug: 169704254 Test: manual Change-Id: I175bdf75e7424bef6d4ac9f51797510766de2b14 (cherry picked from commit 85ccd041) Merged-In: I354ef4b12c75505a069fdf657ab98a9b122785c7