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

Change-Id: I1ea5307e86fabb8c5bf24462114f1718b18600e6