Merge "Fix expected file for tests."
am: c800a33b5a

Change-Id: I3c3249aaa20865b2068da79f64765371fdc46f39