Improved control point logging

Change-Id: I0568ad437d3c2f89b49ba8c5c9503e80014c4c3f
Merge "Improved control point logging"