Merge RP1A.200501.001

Change-Id: I667f7a98e5756f78f5b29a6eb954e9852c8798ce