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

* commit '3539d32806b74bbcd6a89aa99ec31c5acc7e0546':
  Fix empty keyguard for once and all