Merge "Use TotalTime instead of ThisTime in app launch test" into oc-dev am: cbf19dcd76
am: 746305ffda

Change-Id: If7290eecead220e579d22f7c1115bb619cc6386c