Support for Galaxy S Plus

Change-Id: Ia537fd839fec1cc148caf89c7513442e71f857cb