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

* commit '0c758805b385a5c136b21a2b38e2383c30665282':
  Fix empty keyguard for once and all