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

Change-Id: I326a7d9da43e02d0b5c26e0d8476898957524724