Merge "Add ONE_SEARCH_WEB_PERSONAL attribute." into tm-dev