Merge 12b59ccd797c206bd1f9c21232d5cec0cbaa0ba5 on remote branch

Change-Id: I4fe129fb5945110e56a15d135500fabf3e7dcc08