Bug: 28540294 Change-Id: Ib20b1c401e2c28226d9133bb8787f09f09169885 (cherry picked from commit b53b2bd088)
b53b2bd088