Merge "Added logging to debug empty keyguard state" into mnc-dev