Merge "Trivial change to test expectations."
am: c0d8300b32

Change-Id: I58155e3edb424ea6918a3d2bb8e284e61346765f