Test: manual Bug: 143231677 Change-Id: I97e2c3ae15fccc482d07d8d621c455cc74900cfd Merged-In: I0ca22e7c60292d61c758120c1cd67f6e6edd8ae8 (cherry picked from commit 7674de8f)