fix merge conflict, update from origin master.
Merge branch 'market-customizations' of github.com:nullaus/gaia into market-customizations