remove repeat initialization
Merge pull request #1507 from ruil2/init

  remove repeat initialization
Merge remote-tracking branch 'upstream/master' into travis.android