Merge RP1A.200706.001

Change-Id: Ibcd3546b8b4e0dfa99d436e4f42b56ceda966d94