Handle firewall issues for ubuntu keystore

Change-Id: I44997b30c2870a12bfd0a707f692585784c77b06
Merge "Handle firewall issues for ubuntu keystore"