Merge "Fix ServiceState.hashCode() bug." am: 466ff7b990
am: 842fd65fe4

Change-Id: I968a368b97d74bb8f228df38cb8c0700ccb9b4b4