Merge commit '7cd26a5a1cca6a7e7e3e1170f001261516965a38' into MR3.0-Merge-v2.0-GSW

Change-Id: Ibc9b7279c266e88d55dacefcc0bd33aa0441e56a