Change-Id: I0e9faf9d9c63d6541189724813fd803c8522a26b (cherry picked from commit 84edf0b3eeb84c65990926ab8fc69b0f51ce6f3d)
using version 1.0.10