Code Cleaning
Merge pull request #86 from Anu6is/cleanup

Code Cleaning
Merge remote-tracking branch 'frameworksPA/jb43' into jb43

Conflicts:
	packages/SystemUI/res/values/strings.xml

Change-Id: I30e619147f40bae0e93cc49318d1bfaf0e15d860