Consolidate properties for debugging.

Change-Id: I052492375bf176622b38382579b2189d22a05349
4 files changed