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

Change-Id: I40e6535b22688b47845e6c57d3f13963bc8a6201