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

Change-Id: I92000b3131857c97f155a0e92811e113b6b406fc