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