Merge dcdf056de3af7524a52ae3c35e45268008307d12 on remote branch

Change-Id: I12e4520d64010a37522dcfbbee64959ca1da9a99