Change-Id: I617e2645f60a57080058ad5f06af860fb3f682c8 (cherry picked from commit 931f78718f3a09775bfa1f9a952c069c416d0914)