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

Change-Id: I1fbb520f11ad2817fd10b4138a6767bbd8e15462