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

Change-Id: I3a6a8ab69b53a00b3865f232962e7ed5b11722ad