We decided to punt extra certificate to post-R. This reverts commit c8a1960cf4. Test: Treehugger Bug: 112038744 Change-Id: Ic53e58944faebe7aa427975ebd77ce783bdddaf2
c8a1960cf4