Change-Id: Ibfc955a1034f9999a82e29469f3b2d007683e2e7 (cherry picked from commit b7e73f44822cfbf0a7b2d00b9170fae51087850c)