bug:28771056 (cherry picked from commit 0950abe8) Change-Id: I8c5b737c0882ecb8d67d8f799356f30afe3dd87b