Merge branch 'reset/lookup' into reset/next

Merge the reset lookup support for non-DT platforms, from an
immutable branch provided for merging into the davinci tree.