Merge RP1A.200426.001

Change-Id: I033fc12e3db583c391ff0b3a57715b9544fd663f