Merge "Merge "Address API review comments." into nyc-dev am: 9a32929def am: a87343fbeb" into nyc-mr1-dev-plus-aosp