[automerger skipped] Relax testing under GSI
am: c4cd8ed446 -s ours
am skip reason: change_id Ie52e916a658b09eea66ffd9c5f2ac704656f4f3f with SHA1 dbdc57870f is in history

Change-Id: I8271eff16ebf11cd68807bd627fd70a4cf189766