Merge RP1A.200501.001

Change-Id: I04247d0d82e63be8177918788e8170fc29ef9c4e