Merge "Fix dynamic config device location" into nougat-cts-dev