Merge "Update test expectation."
am: e8fc2cedb8

Change-Id: Ifee6e8f2ded23c4ada65498e24dc18c154bf7c99