Merge RP1A.200507.001

Change-Id: Ieec4b4259ae39d64f401839f4043bf52e76a2bf1