Merge 91ea592e729543dc8d34c7bf06f8be3a16006e01 on remote branch

Change-Id: I34872c2b638f20f97e6ad5535059838d79cd340a