Merge "Respond to API council feedback." into oc-dev am: 77cc43e0d2
am: 86e27f65f8

Change-Id: I7933a8ba6858d38423b29a52dfc5f9f65c641faf