Jellybean legacy

Add missing commits for legacy devices