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

Change-Id: I4307c10c3d0cfeb9105b7bd58728035bc39bcee9