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

Change-Id: I109f34999885be3bc9b8d7e5763039b266183d45