Merge 59d402c99c475cec7de55f2e141473c9db1e7827 on remote branch

Change-Id: Icedec60014b5841ed5fc7438a1c3c58df18707af