Merge RP1A.200709.001

Change-Id: If868fab279433570bc2c10abb4f740dcbdb92b84