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

Change-Id: Iadd8b359ae962f519f85cf5eba7b4ae68b81b900