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

Change-Id: Ia0c7b61ec235f277f0266dac3320d25cdfeba4f0