Merge RP1A.200619.001
Change-Id: I0af73851d4fc9716784c03226ee9ef52ffe5635f