Merge RP1A.191120.001

Change-Id: I28150053a73218a55a44c9ee586bbd59badd9e6d