Merge "Logging and Code clean-up for protocol_plugins.core Change-Id: Ia34dd373ba16d7...