Merge changes from topic "hide_log_time" am: 18f5098237 am: ae0a492ed6
am: 20ef85b8d9

Change-Id: Idd0b0737a05e4a56f8f553af4a4a9dcd653d8c1f