jira: none Change-Id: I688c2f05bf85fca376418115acddb5066ef980eb (cherry picked from commit 16f2b2bcb5fd157f25aa7012dabd99a8d31aec07) (cherry picked from commit 7cc21b5e9745a84d75ea13b66f5653520bb1cba3)
Change-Id: Id3d83a58f0cca4899e3247b5854500af79cf1b34 (cherry picked from commit d192ae2d8c7d404048e980cfaa0846be48c5fbad)
using version 1.0.10