This is backward compatible with the original protocol. Change-Id: I93e811cb7775a10af82e70f31ae66d4cd74636b5