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

Change-Id: I28004046f32523b4445cce9036c7170fc3a52f37