Merge RP1A.190528.001

Change-Id: I5cd3cd17afa42740ef547feab9cf2f82b376a6a0