bug:11993304 Change-Id: I4932cf1b5b9b89f0cbf97011782ede037e7d814c (cherry picked from commit b0d97b87ba)
b0d97b87ba