Merge "Added isUserNameSet" into oc-dev
am: a9154ab391

Change-Id: I013381eab8809b98d17e7cf9063a62e4884b0e2a