Merge RP1A.191212.001

Change-Id: I11058ccea03d70ff85fc46c598301c4bc5e48078