Merge RP1A.191114.001

Change-Id: I9b4ba793084bf6d4906f74291193db11c23298dc