Merge "Merge "Fix parameter description" am: 750b523aa2 am: df5f3e6db8 am: b2a1ee15c9" into nyc-mr1-dev-plus-aosp