am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"

* commit 'e2c046fe7c5eefb49f710bc417d54448c133cc93':
  Add NULL check in updateProxyConfig