Some changes (check diff)

Change-Id: I94f07b0b6ce7ce681924e53014a7c60758fc8956