Merge c107e055cd3195a183e36deeda94ab4400f5f768 on remote branch

Change-Id: I7e1ef5360927e03d2a0b44c4fa43173d55994359