Remove unnecessary fields from response

Change-Id: I6b0b9cb4324d7c231fdc733e9272fd1b960a183c
Closes-Bug: 1361520
Merge "Remove unnecessary fields from response"