The code needed a diet.
Merge branch 'merge_upstream_bundle_intent_property'
Removed unused import