Merge "Adds better logging for ImsFeature features" am: 4c5cd98c53 am: cb258ecb70
am: 6a81d39269

Change-Id: I5ea7273c62e98e95a0a5061d2a191b0032a32ca4