Merge "Get clock title on demand" am: 7da7428409 am: f17c2e2e8e

Change-Id: I63553cffba04f6082c09cb2561dc737dcb7faffc