Merge "Adjust MTP to reference by specific volume name." into qt-dev am: 383d316707
am: 951c617d7d

Change-Id: I507f1c1de958ad8b5866eec8334f4a1404c659f2