Everyting we've done plus android fixes all in one big patch

Change-Id: If0219d94dca39bbf1e2210797298dd512573893b