Merge RP1A.200709.001

Change-Id: I8fa6cee0e38e2ed93b51e9d13a675b6a2e3f57ef