Merge IMS changes from klp-wireless-dev to master

Change-Id: I247fa2b0e3aa159a27d96951edb0b04afd4d5ec6
6 files changed