Merge changes from topic "hide_log_time" into oc-mr1-dev am: cd00582000
am: 88618e2b30

Change-Id: Idd22960a413677196f5f5332c8726f48cd699dcc