fix for gson dependency failing compilation
Merge remote-tracking branch 'origin/master' into bgx-global-nav-tests