Merge RP1A.191120.001

Change-Id: I7a755e3c8977488bdea6545d4ffaf756c5580977