Merge 4dd2bec31bb2476e01974004888693190d66e9b5 on remote branch

Change-Id: I81763f76ff149fd279995b4b8c2d437ac19b5d6c