Merge "API Council feedback" into oc-mr1-dev am: 07c83d00c9
am: fda1152e59

Change-Id: I056fbfc35e8523f50c6194ce4b80e70eb17b8aee