Merge "Bug fix: timestamp deviation fail test" into oc-dev
am: 610bc72b09

Change-Id: I407c9b8bd8b8b222d8c811078158a0523a0283ae