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 am: 87182fd52c am: 6f0c4163f5  -s ours am: e6c7099e82
am: 8865b320a4

Change-Id: I1c7c60c52bd57426a7928e6e0dcbcedc3ab81df6