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

Change-Id: Id37a48a7a27a6e2550824873ea376e16b3c949b2