Merge RP1A.191212.001

Change-Id: I9011d4cc1ab997c33da5fcea34b12e4d2003bee9