Merge "Added year logging to logcat output." into oc-mr1-dev
am: f1b6c6c1cd  -s ours

Change-Id: I8b1aae951a4f2427b71860fc814be83a023f8e8a