adjust several parameters

Change-Id: Ib8119d1c7ec14f06da1efcbeabba154eacabb0a4
Merge "adjust several parameters"