Merge "Refactor profile dir creation"
am: dd6b71dfaa

Change-Id: I7ec295c7764f287202ccd4e981e2410c86f05241