Merge 194d1fda084f814984959ecfc682cb8cfd6b3205 on remote branch

Change-Id: I8af9bed1e837cb6ffd9fb19880ee3565f650cf2d