Merge \"Camera: document expected timestamp source\" into nyc-dev
am: 8a22c41bf5

Change-Id: Iebce5b3330a010356892b68ed22b82e100fe9012