Few Device Changes

Change-Id: I3af5788a0c78971ab5976ef1af5111d24967ff36