Merge changes I97a8f820,Ifd02328f
am: 9504023228

* commit '9504023228f92f80113e3fd2f8d93748e2ee14d8':
  Add missing test cert
  Add policy checking info