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

Change-Id: Icde7c38c5b30a1335879c62ccea8995ba05614fc