am aa6ff54e: am 85ee57d1: am c064a1b5: Merge "Remove DRLCertFactory"

* commit 'aa6ff54ef57936024e98d9f565afe9fff24df2e4':
  Remove DRLCertFactory