Merge RP1A.200709.001

Change-Id: I7a470715a0f0cbbe79af12a7d87152256039d9ec