Jellybean legacy

Add fixes for Galaxy s2 family devices