Merge RP1A.191212.001

Change-Id: I1a62fd4aefe88ddb7cdd9febb4534a8d3aff797e