m7 common device updates

Change-Id: I10ebde543b9e87373be5ae2f106c5ecb9b1407c5