Return value directly when using getter

It is not necessary to save the value in a variable

Change-Id: Ia58c94bb19e22476821451bddc2f66e556b773f6
Merge "Return value directly when using getter"