push to alpha 1.1

big merge today for the legacy and other devices from our 4.3

Change-Id: I5a0721ea7d0cb3115320466d1f600ea0ba38c976