Merge RP1A.200611.001

Change-Id: Ic121b5f1fd0fd6da23ef2cf57f222cd8a8dee6aa