Merge RP1A.200706.001
Change-Id: I902319c430904360687a42cd9cffa0b0ce214f5f