Merge RP1A.200401.001

Change-Id: I91f6456ecae8f95ab41c59ff55b3f7cda0d55ca0