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