Sync with the CM tree after latest changes
Merge pull request #35 from NBruderman/patch-2

Sync with the CM tree after latest changes
Sync with the CM tree after latest changes
Merge pull request #42 from NBruderman/patch-1

Sync with the CM tree after latest changes
Merge remote-tracking branch 'PA/kitkat' into kitkat-legacy