Merge "Trivial change to test expectations." am: c0d8300b32 am: 3dd0137ee5 am: 7da529950c
am: 06e3f87be4

Change-Id: I31aab4887f41145ac62afed57e013168541cd351