Merge seek support from 1.2 to 1.6

Change-Id: Ibf0212bade0dc007c540d498244434cb09b92099
7 files changed