Merge "Use assignment instead of reset for profile unique_fd" am: fd695a61c1
am: 32d41fecc8

Change-Id: I660b56126fc76dab6df9ac92b8f43d409b088a77