Merge change 3242

* changes:
  Move LOG_TAG above the includes.