Merge "hotspot2: enclose conditional statement in parenthesis" am: 161ac8b0 am: ea146326 am: 77095c33 am: e7e2dc14 Change-Id: Ib6a5a5bac5886099581e7027af74e90fa98eb35f