Merge "Migrate the slot related APIs"
am: 92b3386572

Change-Id: I3b4a426e58142f7350996049d0c8238325742143