Merge "Fix PatchTrack retry for ClientProxy::obtainBuffer" into pi-dev
am: 183eb5fb74

Change-Id: Ib5ac6e6850629187ad14af6cb15e3bc0dde3c66c