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