Merge \"Limit cached timestamp use if HW fails to provide them\" into nyc-dev
am: 0256917c88

Change-Id: I1186034edf91d3b136b2571fa0acadc9b21de891