Merge RP1A.200615.001

Change-Id: I78638eb47711ece147c48f0fb06ca100aa812717