Remove unnecessary fields from response

Change-Id: I6b0b9cb4324d7c231fdc733e9272fd1b960a183c
Closes-Bug: 1361520
(cherry picked from commit 240b73bb4e3ed355a16963116b2488a03eb93da3)