Merge RP1A.191203.001

Change-Id: Ia7fb547b82a5e3388dc0f0f096c2c0dc112f922c