Fix build, make dynamic config tests pass

bug:23625592
Change-Id: Ia695f96e3c8542ae4b7e2f01e9a65d2ba34107d1
2 files changed