Merge RP1A.191114.001

Change-Id: I2a4befc669166289a1a3566aedd82a6703703915