Merge RP1A.200512.001

Change-Id: Idbc29251c98283ff1736c5a15980bde8bdfd8d71