Merge "Harmony: fix DirName handling in X.509 certs"