Merge RP1A.200609.001

Change-Id: I7deefc45677cfe4f1acb91098b0bd8266cb48747