Merge RP1A.200611.001

Change-Id: I7bae628aa5e1006bcbcf8762cf62db1e8e95eb74