Merge "Remove isCertificateEntry check" am: 7d72975c5b am: 59919babe0
am: 19c7afab62

* commit '19c7afab6244303e78bbc6b5ab04520bbd4172d7':
  Remove isCertificateEntry check