Merge changes I06006335,I581c8784

* changes:
  ProtoLog: Fix bug in ProtoLogImpl.isEnabled and re-enable
  ProtoLog: Cache the result of ProtoLogImpl.isEnabled(ProtoLogGroup)