am 034ed176: Reconcile with jb-release nakasi-factoryrom-release

* commit '034ed1763cf10f060f73d10ee6b4abef896fc3ef':
  Do not send extra data the client is not consuming.