增加多项改进

Change-Id: Ifce48b2b89a4d6c301bbdfb50707f9a11dcc74cd