Merge "Validate incoming data properly." into oc-dev
am: d42aa7086b

Change-Id: I82b29cea6d787e791287420007aac87505257475