Merge b19deec5fe02b1bced66ac96a3a720a8b46d6954 on remote branch

Change-Id: Ic88ae486f827bcdff5878861da8ca2bbe8751c24