Revert "Strict SQLiteQueryBuilder needs to be stricter." am: 896ac37f am: 0df07365 am: ae54b24a Change-Id: I401f9339066ee405c0fd34e08f865cc3cbde5b8c