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

Change-Id: I7635c11b945098d39ae6d557b3df27854ec19d42