[automerger skipped] RESTRICT AUTOMERGE Strict SQLiteQueryBuilder needs to be stricter. am: 92e5e5e45c am: 37e2229257
am: bba6744ff4 -s ours
am skip reason: subject contains skip directive

Change-Id: I8711dac1ad4d2512d64dc489d87ffd4a18c0ebd6