mv range setting refactor
Merge pull request #482 from sijchen/me_refactor1

mv range setting refactor
Merge remote-tracking branch 'upstream/master' into travis.android