Bug: 170591440 Test: manually Change-Id: Iba6d10e5203fa1c1f96c85e39a57483ee26e8111 (cherry picked from commit 8f2c59c0)