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

Change-Id: I8715e7c65d7e547046e6fd06b64b5a2736b0776e