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

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