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

Change-Id: I0ea3b896f6921de05a3836020288950bbd6a538a