Merge 689fa89f497709e01fbef3bc4c66c981a1d7a18f on remote branch

Change-Id: I5db623da0c2fb1be0515dfca9623cd0e7eeacc95