Android O IOT Preview 6 (4475743)
Merge "Refactor profile dir creation"