Merge "Don't crash if no ECA." into jb-mr1-lockscreen-dev