Merge RP1A.200407.001

Change-Id: I693a78dc1eda6d756a0e646f7d70cb08269040f7