Change-Id: I7ab839ce02c22fb48c32b52184649fb951efbe95 (cherry picked from commit 2f1f2bedaf5420ceda3d2f29b7e44a1cc863ccac)
using version 1.0.10