Merge "Fix dynamic config device location" into nougat-cts-dev am: ad53ee5837  -s ours am: 046e700ab5 am: b18db731e4 am: 8ede6055c3
am: d34f39edc1

Change-Id: I515be40393036f9eec208dac0e30f21548e764f9