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