Minor improvements on LocalPreferences.
am: c19f95628e

Change-Id: I677bc225e91b3a6cfadadb28f99ca66bb6dcb1fe