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

Change-Id: Ia6b8efc3a910188f48f10abc3f0fc5d2e7d36146