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