Updates and device specific changes

Change-Id: Icdf527543ce7efa70b0c1a78de3b447195153405