Merge RP1A.191212.001

Change-Id: I537a52db7ae0510a2af1930a8168047bce8fdc9b