Merge "Hide running time information for "Android System" entry" into tm-dev