Merge commit '341483f3bfd66af4c84f0e86ac0edad4dbc224f8' into MR3.0-Merge-v2.0-GSW

Change-Id: Ife088db8d5f4caffa75143a3c56785d3033e1ef3