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

Change-Id: I65c49c99106c47c0b0cfe70f3673b079bc00b323