X3:Init tweaks for better battery life

Change-Id: Id4a0b431aabf9c8ed54a12a06609c25a8e3c4f4c
Merge remote-tracking branch 'cm/cm-11.0' into HEAD