Merge RP1A.191212.001

Change-Id: I547b7d20d21b3584a09caf80d59ab19f44c93242