Merge remote-tracking branch 'origin/R120'

Change-Id: Ieb6bc670a2d15af51f0fd5b4b99bd27bbac640d0