Merge RP1A.200601.001

Change-Id: I50a493a445c523fcc4e2e59ad1851ed1fd27c7e4