Merge "Merge "Check for Valid Frame Rate in Header" into mnc-dev am: 340963d1 am: b017bd36 am: 3813c97a am: 76ea7ee0 am: 86fffa73 am: 44f4d18f am: af6adb07 am: f2ad7a40 am: b7c0507c" into nyc-mr2-dev-plus-aosp