Merge commit '64ed11609aa0042607b89c820e9ffbb9acb284d5' into MR3.0-Merge-v2.0-GSW-FOR-API-1572

Change-Id: I1c788575ccd43ad9d39edf4f4a3da4803a97a46e