Bug: 169763814 Test: manual Change-Id: I15dd22791fcc61ef02b06ad51d9e4409d11c0181 (cherry picked from commit f45dcfe1)