Merge "Validate incoming data properly." am: 5718b01b9a
am: 4fcfe05707

Change-Id: I129a3e6c1b401448c075cd63c5396914bfb67fd7