Merge RP1A.190528.001

Change-Id: I534958a73164c1efa26250fa6658aa752628af27