Merge 472541aed9c6634978122d16fe3be4de3480b28e on remote branch

Change-Id: I109d8fcb1f577f2b34036e5eb9ce7677b7fd406c