Merge "Encode frame info using varints." am: 1bfd891d06
am: 6199b8336b

Change-Id: I85cf0381ae7432df5a1edaacf72c5556f7f2eb59