Add support for stylus am: 7f9dd3c06b am: 6f5ec47654

Change-Id: I6c85b6c780c79d5805c794c2565a523fd87cedc5