Add ability to add extra settings.

  Bug: 13077452

Change-Id: Id1159405d8cbbe3b84b94899b9f6352e64e428fa
6 files changed