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

Change-Id: I4abb8d87ecd681105a059b264b3c4808fce535bc