Merge "Check for null appToken" into oc-mr1-dev