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