Merge "Fixed warning on getWebDomain()" into oc-mr1-dev am: 256c2822f5
am: 8eec0c723d

Change-Id: I415492d049ccff8d0d83eb9679c5b95f1d8dc0a1