Merge 57affbdda8f911f9e9e78691f4c1319e33da628c on remote branch

Change-Id: I704b9f68ae21efd403ef42e7cd77e47848b01093