refine scc rc
Merge pull request #1383 from ruil2/rc_refine

  refine scc rc
Merge remote-tracking branch 'upstream/master' into travis.android