am ea30d010: (-s ours) am 0fcb69e6: Merge "DO NOT MERGE Work around for use-after-free cert bug" into jb-dev

* commit 'ea30d01040ba3e7119f24f8a15632c929b93e6d5':
  DO NOT MERGE Work around for use-after-free cert bug