Merge "Restrict SipProfiles to profiles directory" into nyc-dev am: 51747dda47
am: e69d27b16b

Change-Id: Ie6f332494af3a2207b77ac10ba94f1d8a147f8ac