Sync with Scotts Repo as he brought in Carrier logo and also various others changes.

Change-Id: I035576e789146caf38b8618a014457ccadea735d