Merge "[Manual] Rename methods and classes"
am: 3669be9599

Change-Id: I77ad83fe0f2ccf2ca26579e9995904c9ffe372aa