Merge "Removed unused private variable containerAwareRegistration and unused import "