Merge RP1A.200601.001

Change-Id: Ib13efa7a78dbf8d270c250919b919c7db2dc48ad