Merge "Re-deprecating Capabilities in ImsFeature" am: f4cd3de77a am: 36d3aa0e02 am: 86d97445cf
am: 384b50304f

Change-Id: Ib8d2e1d1184a168dee79ac3e31b6a46f4c0b3ac5