Merge "Rename to follow API council guidance." into oc-dev
am: 0d6c3a691e

Change-Id: I9116471537b51bd3aa785ff21f0bef48ec380889