Merge "Use AVB footer to determine caremap"