am 9042b4ce: am 3539d328: am 7f3a1557: am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '9042b4ced76b5ecdb6d4c334eb7004c34c7892a7':
  Fix empty keyguard for once and all