Merge "Extend LocalLog to enable UTC timestamps" am: 9436134056 am: c74594a2e3
am: 746d69afa5

Change-Id: I167f79a33218c5b6593c165f9185663f965dcdcd