This combine the first UgoRaffaele's commit and all the ParanoidAndroid's commits before HALO 2.0

Change-Id: Ia0ebed96b0993eee0b350278a2f9b2ff1ee25cd2