New syntax for config files (build issue resolved).
am: ab614eabaa

Change-Id: I62a2be7dab2b182710477ce929653b96791a8f33