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

* commit '7f3a15574c0b33c194625046cdc47a76879434db':
  Fix empty keyguard for once and all