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

Change-Id: I0c2382eecbf9daab4a49118b8782e0b1e8890567