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

Change-Id: Ia39f72bece66a2d5bd180e761fc96858d87b3259