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