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

Change-Id: I4279400bd5a5ab441961942782054d5e810235c4