Update common stuffs

Change-Id: Id943dafb19638488f025362ece7ababc5d79219e