Merge a1936fd8683d43a3aa585f00c3f3660bddff1e12 on remote branch

Change-Id: Ibee8a6121eacbe5d6803d9625a1e6177a8289869