Cleanup for commit f4a421a

* Fix brace style
* Change contentResolver
* Fix string key names and string language

Signed-off-by: Evan Anderson <evan1124@gmail.com>

PS3:

* Gerrit history changed, fixed conflicts for merging it.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>

Change-Id: I82d90a54fbfe5bdc48d2ea32eebd671e0303b6f9