Merge RP1A.190528.001

Change-Id: Ibe3c3fac749d9ef74dd84f3508f3ad1c149c30b4