Merge RP1A.191114.001

Change-Id: I327117df4d5767b24bc7bb9cd622de9d277a7303