Merge "Update description based on API feedback" am: f397b39442 am: 784556da5b
am: d12b6c929e

Change-Id: Iae04c9f13a9bdd12b69e7780381f202a55bfc44f