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