Merge "Use unique_fd instead of fd_t when managing profiles" am: 02971e3348
am: 9f6666ae1d

Change-Id: I77f6d375afbcb85a77b640a0d47ba741c08bd406