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

Change-Id: Idab8b65c1b71d25c71db12928d363e9e28b4f662