Merge "[AAI] Update truststore path to generated certificate location"