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

Change-Id: I1bd77401d959394f9bb0ddf88bf6449125c8fd5c