Change-Id: I40121fc3d36e430c402da2835027283eb4b11071 (cherry picked from commit ce83f978d5bff5505a1d5f9bec894fe5f1091a4d)