am ae73a9ae: am dd31e3c7: --device option sometimes ignored on start command when used with --test option

Merge commit 'ae73a9aea3fd116d0568b6245755631b0664eca2' into gingerbread-plus-aosp

* commit 'ae73a9aea3fd116d0568b6245755631b0664eca2':
  --device option sometimes ignored on start command