Merge "Update for modified CapturedStderr."
am: c16ddeb1f3

Change-Id: I3965adac3c7020e3b451c203170e00701e52a991