Merge RP1A.200401.001

Change-Id: Id5cf513956509a0f03cb0b75efc0e005aeae9e50