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