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

Change-Id: I55f44d8a90be5d7025f035096e1a56774d1deca1