Add config from upstream

Change-Id: Ifccb466fe80086165c42e067fa55e14e7ae3f316