Merge commit '6f6759fff72e44f03806265aa64a4bacca9a11dc' into MR3.0-Merge-v2.0-GSW

Change-Id: I08600cdf97ee0bbaa58112863a9c5bde6299244d