Merge RP1A.200601.001

Change-Id: Ie18bbfe54417c7f80f863842235e730ab377636f