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

Change-Id: I540bb4ada6bdf30f44c4ce7e581c945261df3d81