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