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

Change-Id: Ie9b4a033dfb08ea9326725e66ed4787a1ed69651