Merge RP1A.200611.001

Change-Id: I81aae8146d2992c0512ca8286d4efed60e2b37a9