Merge RP1A.190528.001

Change-Id: I8c0111495b8b3709436ba13da5a3ebefed3e2984