Merge RP1A.200605.001

Change-Id: I061ea9983ee441f9989e92eb030988faf36cdb44