Merge "Update for modified CapturedStderr." am: c16ddeb1f3
am: f6721f8e38

Change-Id: I151bd2d64c2bebc73a92314a711dde8b4ce5941a