DO NOT MERGE. Execute "strict" queries with extra parentheses.
am: 5a55a72fcd

Change-Id: I4be4620726e30ca4131320bde074a2e572c51a42