Merge changes Ic190bd8c,I865044c8

* changes:
  Convert missed ERROR() to LOG(ERROR).
  Fix include order.