Merge commit '96a3530c5e108b40b984d95c271337c4412a8a52' into MR3.0-Merge-v2.0-GSW

Change-Id: Id131ceea594032890594f4eb2e1b2a3ad3f2a0cf