Merge "Merge "Check for Valid Frame Rate in Header" into mnc-dev am: 340963d160 am: b017bd365f am: 3813c97a7f am: 76ea7ee0f1 am: 86fffa7349 am: 44f4d18fcc am: af6adb0702 am: f2ad7a400d am: b7c0507c9d" into nyc-mr2-dev-plus-aosp