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

Change-Id: I62b18ba9604dc2e5f020d64775b43d9cbc7efec5