Change-Id: Iefe1753a08fd188a274b4d555c5fcda8fca6d719
Change-Id: I7d4e84c4e82371c6e688b607ac0658c6319d1216 (cherry picked from commit 6ff1613c3997628ea932d4956f874c2356da0056)
using version 1.0.10