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

Change-Id: I6b2badb1b075c1eb8d8e9d1e25397fc41ab1aae3