Merge "Improve invalid object logging"
am: f5ba1152d7

Change-Id: Icb2effb6f24f918b1f4b3b7139a18fc05e5133b3