Merge e866e797730877c60819da1a0ec2078c7c78f8bf on remote branch

Change-Id: If23d42e17a2212993bb102d616d0954cf464aa76