Merge \"Only read timestamps from HAL if not FastCapture\" into nyc-mr1-dev
am: b5aac433cd

Change-Id: I35220717ab32936421a8dc906c4af2cac979a5f5