Merge seek support from 1.2 to 1.6

(cherry picked from commit 92c8c3c9f6d5318f07cb76d934c20ba1592a5581)

Change-Id: I340deefa71ec480327344c9dabe4c1e93f03e59a
7 files changed