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

Change-Id: I5485eaefd5dd57ff992e2c9dbdd1c343477466b7