Device rebranding and various fixes

Change-Id: I6cb55ea6adde64d02a8e338485ae8e7a00afd46a