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

Change-Id: Ia73161a2e4b629b3b1afcacd0c9837749bd69a85