Fix merge from master into ARC'd branch
Fix merge from master into ARC'd branch

Amnysia/SSToolkit,carabina/sstoolkit,SuPair/sstoolkit,sideci-sample/sideci-sample-sstoolkit,lijie121210/sstoolkit,soffes/sstoolkit,rtsbtx/sstoolkit,cobook/sstoolkit,zilaiyedaren/sstoolkit,samsoffes/sstoolkit,zjh171/sstoolkit,andaluz/sstoolkit,k131050059/sstoolkit,TDness/sstoolkit,samsoffes/sstoolkit,Amnysia/SSToolkit