Merge "MTP: remove usages of device identifiers with virtual serial number#3"