Change-Id: I7d002ce7fed08ee949335ef838014a6885ffaf5e
These are really similar devices so one commit for both is ok. Change-Id: I8bd1d3fef1eb6d00aaadfb7af56c771f62d0c9c3