Merge "Flush dcache when storing timestamp" into integration