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

Change-Id: I69b6159217b82d27cb69f00ea3826f1fb8096e1d