Merge RP1A.200515.001

Change-Id: Iaf67d2fd3e7a1c59b47c972e1e768d8705388187