am 7ca5d693: am a94333ea: Merge "Revert "Make parameter name match comments for sdk build.""

* commit '7ca5d693b6b32d5f3382a2a96e499d6920ba4cc6':