Merge RP1A.200611.001

Change-Id: I3dead2e124abcac00b99949c5d774b13884650d0