Merge "Add additional checks for invalid parameters" into oc-dev
am: 46da191f22

Change-Id: I86c5c5592e536001816a96293edd4dfce48fd07a