Merge "Merge fences when needed for accurate timestamps." am: 6261e9737d am: 05f5697b41 am: cf3af035e2
am: 9d6480f34b

Change-Id: If373801049f87dc12da7145c2076225127bfca74