Merge RP1A.200601.001

Change-Id: Iacd759bafa011b794bbb65cbfc88a03325caaf22