Test: Manual Bug: 197495312 Change-Id: I5e65a183a907d0f16649ad84a1833e25e6065db9 (cherry picked from commit b7c2dbaa)