Merge RP1A.191120.001

Change-Id: I1d0f8591224fc0bb823de3c728ac00843d1a8b43