Merge 8e990c106b03ceb999825c3f060db1dd1ae02fa6 on remote branch

Change-Id: Ieff4ed3108754188ec1cedda06b11107214112ef