Merge 47aced31143bbbf072dc7eb36889363c225c05ca on remote branch

Change-Id: I2b80a6a4c0125ceb25e646b9a11cd8277dd9f05f