Merge "Stop posting config asynchronously." into nyc-mr1-dev am: 6c816c6707
am: 331eea4900

Change-Id: Ica84c11c5edecc2deee90cfd580f60198aefcc9a