Merge RP1A.191212.001

Change-Id: I20a711af51b301815eb501b81c9d062325d4650c