Explicitly include version info in output_data
am: e2d551b4a9

Change-Id: I161335c621ff478aa7d0e806c32dcf3c4324fa55