Merge "Header changes for getFrameTimestamps" into nyc-mr1-dev