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

Change-Id: I9e41499f23b0b265f732770feec866f75616f64d