Merge RP1A.191114.001

Change-Id: I1c14696603162efac7cfbd25af08fb08f7991d16