Merge RP1A.200407.001

Change-Id: Id28b2baa9627edcb849c71ba07424403d76a0f54