Merge RP1A.200123.001

Change-Id: I1c0e28d8752befaa924712f85611fa5aae682986