Squashed update from Evervolv
https://github.com/Evervolv/android_device_htc_msm7x30-common/commit/15131ede4658a354170bdc939bb9ac0056baebf9
https://github.com/Evervolv/android_device_htc_msm7x30-common/commit/a4de996405bd522cd26e93ea649b6bd17808e1fa

Change-Id: I1a083aa96e39fc187a990c09d6a8f1a56ab3830c