Merge "[Advanced Features] Change the source location of advancedFeatures.ini"
am: 08a2bdae08

Change-Id: I10dde63b850f10d187459345b19ef860009aaa37