Merge 1bcba7c6150e1dab9e2d8f5077bd15fe29badc36 on remote branch

Change-Id: I72a1eb327f95a1e081fa4f992d1a36569cdf1883