am "small fixes to gscan interface"

merged from goog/mirror-m-wireless-internal-release
9f16832 small fixes to gscan interface