Merge "Restrict SipProfiles to profiles directory DO NOT MERGE" into lmp-dev am: b85ded74dc  -s ours am: ef97df841f am: 130e997964  -s ours
am: fc016f7775

Change-Id: I080aca8638935157b6d3a20ceba6a753db50e4c0