JIRA: MAK-xxxx(no jira currently) Change-Id: Id99511355cec7a51cafd5254f308c60a7ac1f57d
JIRA: STUDIO-4231 Change-Id: I02ff6343124ef2ea3642e5799469249538a4b97f (cherry picked from commit 781793a4c84b3e8a01f38d990d34bee9add8850a)
using version 1.0.10