Merge RP1A.191114.001

Change-Id: I1ce24cab72ce0feafef8d10e49bbc90218b329da