Merge branch 'stable-3.2' into stable-3.3 * stable-3.2: Do not use timer.getStartTime() when propating timers metrics Change-Id: I7abf8f2f353d889baf9e0f5f97c2867b7fd1d3ae