am 82b18e8d: am 9de5901b: Merge "Don\'t crash if no ECA." into jb-mr1-lockscreen-dev

* commit '82b18e8d5c4ceac56c4f5d6ca96f69e37a21eeb3':
  Don't crash if no ECA.