Merge fdfe92335e2dabb10857bbfb7f765cd2c6a216af on remote branch

Change-Id: I35080879900e870979c6a2c80ce401d482676ddc