[automerger skipped] Merge "Passing ServiceState as byte array into ServiceStateProvider" am: 17ff1e257f am: 50b6388ad3 -s ours
am: 70165f0045 -s ours
am skip reason: change_id I48053f3ae7ed8ce5c24e7406d66c442023ff8882 with SHA1 7d0cabc2f3 is in history

Change-Id: Ib06f01627aba8ba74ce27e69a5a6a811fb072110