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

Change-Id: I43df19d2e8703df431238ad5fd25a59cd6863262