Updates for gscan HAL updates in N
am: c90855d7a9

* commit 'c90855d7a9f3ebd300de4dad9842cd6771ff27d1':
  Updates for gscan HAL updates in N