Merge e75378e0a3714d11060712246cf04e6ddfd93d54 on remote branch

Change-Id: I180a673f28e2c3dcb7c2a96616191ad0c9386642