Merge RP1A.200601.001

Change-Id: I515c5aadc1172810385d029afcf8b354d3f645d1