Merge RP1A.191114.001

Change-Id: I77070c7eb1c811892c37a4fb4e2e6c2242ed4ad0