Merge RP1A.200601.001

Change-Id: I0c77fca8ddaa7644243ba335c8974cad578d8e4b