Merge "Make Mtp FFS allocations per session rather than per file" am: 3f6419d0e5
am: 57b71e605e

Change-Id: I32fbf049eb8c2e169d09618dfbbca09ca7b5bb13