[automerger skipped] Merge "PassthruPatchRecord: fix null timeOut case in obtainBuffer" am: 17437eb4b9 am: 55a5ece7ca am: 5dbd702262
am: 50279dfc41 -s ours
am skip reason: change_id Id352e47682c0992b817f26b3b594ec5913e663be with SHA1 4de4997e66 is in history

Change-Id: Ia16ecadbb2d1a5c316102c14cd3b37c5871586f2