Bug: 159654050 Test: manual Change-Id: Iecd94cb96ffceff4cea8f5bf5f6ea32a2bf64cfa (cherry picked from commit b34928e0)