Merge 74398ccbe3679f769ed6fa7933ceaedb254d979d on remote branch

Change-Id: I86db4b2c86db51329063a6c779a4c7d996ba57d5