Merge "Add more details on FD sharing" am: 32e787a9e2
am: 4e4eb13877

Change-Id: I8922ad9ce457dec97c5388e3eeae74887d4c61f3