keep the consistency between sps level and parameter level
Merge pull request #1623 from ruil2/level_5

    keep the consistency between sps level and parameter level
Merge remote-tracking branch 'upstream/master' into travis.android