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

Change-Id: I841e1f420a3e5f37839aa840fa7a88de6257772a