Merge "Fix parameter description" am: 750b523aa2 am: df5f3e6db8
am: b2a1ee15c9

Change-Id: I97356fde75e28e6074a819814353070a7e3327c0