Merge RP1A.191212.001

Change-Id: I723819ccf31c56f9cb3ad9722046e10612a4b068