Merge RP1A.191120.001

Change-Id: I3f65103babfcaba39c7b9ce2f01516b4d128b7ba