Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b006 am: ea14632665 am: 77095c33d3
am: e7e2dc148c

Change-Id: Ib6a5a5bac5886099581e7027af74e90fa98eb35f