Update configs

Change-Id: I8f845d91a081ce6592ff680c967467c1a6276c62
Merge "Update configs" into cm-10.2