Merge commit '99cc6f8f1aeeb33ecf1b88b8773ddba78ea7b532' into MR3.0-Merge-v2.0-GSW

Change-Id: Iaf3be8ac6ba6af86c4691b199c8c86a6cfab205a