Bug: 154772063 Change-Id: I3b2bc2e341037746891658f2596999248ec272ef (cherry picked from commit 12baaadeca)
12baaadeca