[automerger skipped] Merge "Fix test to use better flag." into pi-dev am: 25147ae3c0
am: 6d4c003cca -s ours
am skip reason: change_id Ifc61efcc65af5becdded161048f5606c09d83013 with SHA1 351038a090 is in history

Change-Id: Id1c0ca2761ca24047f22715050126bfbc0e28571