Merge 0ed6fc0bc8300da4db5536e0227044496f688c71 on remote branch

Change-Id: I2294b0a7a8349dd3a0dff0dc77eff375bf39c17f