MTP and UMS left the station

Change-Id: Iaeb4cd18e364a45006efba0de501286a63d1aef6