Some changes

Change-Id: Ia7c5bf9944b09a41bca3aa578a066d794ab9da0a