Merge "Avoid a warning about extra parentheses"
am: f935254cc9

Change-Id: I838bc99ee6450cdf300663f3a1c356e5cacf517f