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

Change-Id: I405d270b964f93e643b1630250bc09dda229987a