Merge RP1A.191114.001

Change-Id: I359e02be8c53ef25f2a5080b5c01aab90d32630e