Update the proto and service state logging.
am: d009ecff13

Change-Id: I6a908bf180d46d34c50b802faace7c5b7440060a