Merge RP1A.190528.001

Change-Id: Id18dbbb8b52e5fe47900bf39e69e31f82ed1ad0f