Merge RP1A.200601.001

Change-Id: I7223862e2f728bfde06d1eec6ab6cee7af69306d