Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." am: fb65c0c24b
am: 40676e7cba

Change-Id: I07d03570c8173eff319c102ce73c51025afdd056