Address further API council comments. am: b0e1e7ec3e

Change-Id: I539d05a584c40606f0f27bff06e9585407b53cd8