I should have included this with the original patch. Part of bp:mutable-config Change-Id: I847813ae16d5c501be0926e8a579efe7a8fc987b