Merge "Add logging constant for wifi tether setting page." into oc-dr1-dev