Merge RP1A.191114.001

Change-Id: I497e869aa8aa8120fd2afa26c35517087dd9de79