Merge ef4d800a54f45b465bebece6f7e6c4492c7423c6 on remote branch

Change-Id: I7ca1570df176dfb4eebab790b559ca524e54e3fc