Merge \\\"Limit cached timestamp use if HW fails to provide them\\\" into...
Merge \\\"Limit cached timestamp use if HW fails to provide them\\\" into nyc-dev am: 0256917c am: aeffd19d
am: b18af48e
Change-Id: I628b8869bb7dd183270a6309c6e70072786e00b5