Merge 6838f2aa9541977e40e643c80cf0817172ff95db on remote branch

Change-Id: I619cbb33720c14a334d8d6ef94976eb19d1279fe