Merge RP1A.200605.001

Change-Id: I38206f7f9c8f573d2e4b89a6a9d6db2f8ed2ffc7