Revert "Strict SQLiteQueryBuilder needs to be stricter." am: 896ac37f am: ebcaae3d am: 98c7e6ef Change-Id: Iaabe515448c98e97cc8fd400a867ee0e0982e941