Merge RP1A.200601.001

Change-Id: I12da530ca713df0cbcf4787e33d8e1578e73e577