Update configs

Change-Id: I92cc97d57757206188805d60ef370fd3f85d4a73
Merge "Update configs" into android-4.4