Merge "Handle more invalid patch header cases." am: 09bab64d7c
am: d4f6396692

Change-Id: I7a3aa46d444d395d438bc9fd5b4da3cd8e70aa76