Merge dd6dddf1c26e63a15f2b512c6744ea8253ace2a2 on remote branch

Change-Id: I439e0f8cb948e86351fa96d3be5ced5a222694d2