Merge ca0bdb774838ba40523b6b50de479239d5134b64 on remote branch

Change-Id: I4293be69d0922578620c3f979c63eb83a5addb61