Merge "Return an error if apiVersion is 1.1+." into oc-dev
am: 8c109c638a

Change-Id: I1e4e17b02155a4095d28cfff8791f63b7dcd3d08