Bug: 191608501 Test: Manual Change-Id: I51620582c1b1f2fdd9bfa2ee55e2aca8760d358a (cherry picked from commit 514c5f40)