am 4f33a5d7: am 1f835093: Merge "Remove parentheses around return statement"

* commit '4f33a5d7dd50c9ec883e0a3377327460e1df5015':
  Remove parentheses around return statement