Merge "Implement CACert queries in SecurityController" into oc-dev
am: 4c78ac9ce4

Change-Id: Ic4a8e36b7f14ad8ebb2b23e76ef6c38f1bc1da72