Merge RP1A.200601.001

Change-Id: Ia65576c344d856c58a6f6b195d61041dc5e80bec