Merge RP1A.190528.001

Change-Id: I9e2fa6e5396c7aee0a51764df4a4b1b94758772d