Merge "Merge "Address API council comments - CTS" into oc-dev am: 9b4be83a37" into oc-dev-plus-aosp
am: 941d5a4844

Change-Id: I4cd238325be24c992db5f7f0886383beba289269