Merge "PassthruPatchRecord: fix null timeOut case in obtainBuffer" am: 17437eb4b9 am: 55a5ece7ca
am: 5dbd702262

Change-Id: Ic852d7dff3c5577296f8366a440245a7bfbcf3b7