Merge "[Manual] Rename method parameters using Java naming conventions"
am: 20d7ae1f61

Change-Id: Ie4b2ddf152e6adbf2725e7786a447941d6206558