[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 0e66ea6f32 am: 71765a75d1 am: da99669780
am: 857d24b804 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic6cc34a41e6d5417b6e2d8af95020e6093f6b2b5