Merge "applypatch: Fix a potential nullptr dereferencing." am: b9b50cd58c am: 471053ba87
am: b5c13bc7eb

Change-Id: Ie4d39fd1585c874e18a01ca0cea6e3c3fe9d77f5