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

Change-Id: Iad645be722f64d13f58d34cd6aea2554785ee9fc