Redefine query columns in provider am: d3eeb40f05
am: fe5bc3a445

Change-Id: Iac705b476e212f5804e44deacec679df07f88465