Merge RP1A.200601.001

Change-Id: Id610c7ccee613913d80591b98659eeb28a94b6a3