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

Change-Id: I5885af5a5c5f013f74c9a1ae8866799117b9cbd3