Merge RP1A.200709.001

Change-Id: Ide344b7e6727da9e622f17386a59ef0ba7e93aac