No ticket: Grunt changes from 2.0 selector-native
(cherry picked from commits 1083f82d1ee0c8f15a66be15e6184294a69d4420 8be9cd1ce71de8affa32a85b596c1bfed2e714a6 054c6946d4f86e4ba5ce6284554c8cacd7498e93)