Merge "[API feedback] api fixed for getSlotMapping" am: 9931252c3f
am: 58fed7fac6

Change-Id: I858a9014859f6c44862165cc7a970bdc20176fe4