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

Change-Id: Ib8301a4e2697b275ce5e981bab31ca9318397dbc