Use shorter method parameter names for code brevity Bug: 293811969 Test: TH Change-Id: I271afc22383e2dc6ff47526f2ef963c785349421