Change-Id: I40755109fcab4532cfe7d2314accc7d9f61c249c (cherry picked from commit 0398a5c5d842629b7aedfc989602d78324a64934)
using version 1.0.10