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

Change-Id: I9c44587dbdbe79647d0a9bdae3c10ca7cea66f42