Merge "Add fields to log secure/unsecure buffer playback errors"