Merge RP1A.190528.001

Change-Id: If84a3b3f8dfaeaeb312a40aa8a995ae61f362a2d