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

* commit '9b15f2e57520d89fdd350a23ca97db36c3e5b7ca':
  Don't crash if no ECA.