Merge "Use uptime instead of elapsed for measuring duration" into oc-dev am: 22c2be0fbc
am: 85e6dd985b

Change-Id: I1c6e773427438e0474ca44ba49dddfcafdaea3da