Merge RP1A.190528.001

Change-Id: I3e5dcbd88b59130c1b740219345f83d247ad5cb5