Merge \"Merge \\\"Limit cached timestamp use if HW fails to provide them\\\"...
Merge \"Merge \\\"Limit cached timestamp use if HW fails to provide them\\\" into nyc-dev am: 0256917c am: ed61ffb1\" into nyc-mr1-dev-plus-aosp
am: ee5697bf
Change-Id: I1e31d2b34dd01562d9e303696b2aa404fe015ef9