Merge d0c3bf60c7baaaf7f6b7311f484d2b3c28f1cbe6 on remote branch

Change-Id: I6f10921ae034c6792a17bb87fb7c93dc4cf1fb75