amend some tings

Change-Id: If630e3c9f0cb4a86da5d82468cfcad38f5a34869