Merge RP1A.200605.001

Change-Id: I7f4f956e84bc3320246d4be9535caa14fe9104ff