Merge "Address API Council feedback." into oc-dev am: f147688149
am: eebe305a52

Change-Id: I9345ac184b1257c7750a3cd3eb46603394d470bb