Merge commit '2e177267f1cc007efed09f12bfebfc520e25a969' into MR3.0-Merge-v2.0

Change-Id: I99a05c31c704005e1fcff8a6f32c074c416ecd8a