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

Change-Id: Ie9ea74febab0d5d547694ebc92a7b04d5b1b7906