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

Change-Id: I84aa5dbf58e8363dbab62dcdaae1c39514b3526f