Change-Id: If502ebe94f3b6414f51c7238df4c49e756393d07 (cherry picked from commit b6ecdfb087106abf405691f48a222ae628c2ff14)