Merge RP1A.190528.001

Change-Id: Ia1fc1a1c3989cdebd06f545c42a33f247fec9d64