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

Change-Id: I9867e073ae10d0df1b91b2171d00697e57a57fcc