am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" * commit '28f032e6': Add NULL check in updateProxyConfig