Merge "Fix NULL instead of DPC name is displayed in Certificate warning" into nyc-dev
am: 19c7ef11bd

* commit '19c7ef11bdc649b3619f421946225d8953218fd1':
  Fix NULL instead of DPC name is displayed in Certificate warning

Change-Id: I85bb03da5e85fb401e672783295e5f545dbd10ab