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

Change-Id: I88cc18d9f6519a2aacc2ecc9618009cb24b4ae85