Merge a5da27989b4bc3279c75edd744159b4019c904e7 on remote branch

Change-Id: Id8c143b5f51b243f516283c03371cdd4319e3118