Bug: 148867568 Test: manual. Change-Id: I6bd97ecb57ddc2a7e1ccdf9c84bb895f372b2358 (cherry picked from commit d04d6d51)