Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f
am: 7bc818be88

Change-Id: I31adec6bbd4737df9571c7ada3b0b1618b998ce0