Merge RP1A.200709.001

Change-Id: I1f8f0c520c7226f3aa23dc36e11faff76af34df0