Sync with Ion 2.4 & 2.5 Android Ion
Merge pull request #384 from Icenium/totev/ion25

Sync with Ion 2.4 & 2.5 Android Ion