Merge RP1A.190528.001

Change-Id: Ia573c90cbc5b51d9b1a9846ccb3b2a16a89717ab