Merge "detect api version, and start respecting offsets" into pi-dev am: dfdc379144
am: 90405d02cd

Change-Id: Ied06df3460e90779e3015e6ba64406a068df5472