1. Address review comments, 2.Fix script issues

Change-Id: I9b1489d06bc6ba0fd297183c3526bc6a063e338e
Merge "1. Address review comments, 2.Fix script issues"