Merge RP1A.191114.001

Change-Id: I475df8511d4e4993da898f36a215f5a7e39f3bcc