A bitwise AND was use when a logical AND was meant to be used. Change-Id: I4e5529ff9fce1e6397d7cd9483268766fc92dcf5
58d6a20c
6b178e47