Merge RP1A.191114.001

Change-Id: I959cffe1d5cc0cd5c7e6a112b01cc2226c3604a6