Merge 08abbed0837eb9d7bac07305cca8bb2d0b98aed3 on remote branch

Change-Id: Ifb59aa70efba819191161be9894cdd2b8bc553ff