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

Change-Id: I08c80e60a89ab359c83e4043a1dfb74c92dc0b8a