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

Change-Id: If52f2c1d233cb2a18aaa527a972519e9b145247e