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

Change-Id: Ib21d66bc5deaeafd1802c4ee1e573c87846e5fdf