Merge 9dc6c290668b5f0ed4290a6ec6da48c51211ceb7 on remote branch

Change-Id: Ic37a9c13fb4f1c5952749fdfea7a5ecd6ee68c44