Merge "Update duration text" into pi-dev am: 538ba7ac35
am: 825ac25ea5

Change-Id: I84f21aaa24110a44062aacce7ceba04664ddb38c