Merge "Removed logging for the empty keyguard" into mnc-dev