Merge "Remove workaround to find the latest lsdump files" am: e74a73a610 am: 67598b1947
am: be584bf764

Change-Id: I1227665b6b7fd7b68c3fc54098c1dd4e78c87e4a