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

Change-Id: Ic08f1d7c4e417aa2a0f508b999dcdbb805838686