Merge "DO NOT MERGE Manually CP ag/1781120 to fix dynamic config file bug" into nougat-cts-dev am: b057d7adc6  -s ours am: 2a51f55764 am: 2878aa6e0e am: 93589ab87e am: b14a46e3f7 am: 18d681b849  -s ours am: cac9b8b5e1
am: 10c8a4f14a

Change-Id: Ieee6f5a8bf7df2e355de24444c49eceb44185f52