am abf701e6: Merge "Eliminate mHasAlpha" into klp-dev

* commit 'abf701e6751aed487d4ed0986e0fae8810c3658f':
  Eliminate mHasAlpha