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

Change-Id: I6ff1b88dcaca08cfce6196b0f343cfbdae613bcb