Merge "Update types for long trace arguments."
am: be47e718e2

Change-Id: I8bdb34049671a88df22de6842feff28bf2ba1d38