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

Merge commit 'dd31e3c7cf5e41fa1f978092a9e7ae775ec38342' into gingerbread

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