Merge RP1A.200624.001
Change-Id: Ia1e160420d4f8d2e57d9c2dd46184f67a074199c