am 0a640a4f: am e0a834ba: am 428ac0f9: Merge "Fix object logging"

* commit '0a640a4f02cf463290332dc2aaf13282fd525165':
  Fix object logging