Merge RP1A.200313.001

Change-Id: I6507e3eb86301339351d7b2f4e6cfaebb9a8b574