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

* commit 'fc603ca6b518777a7e4dc391bc771e5609ab3ab5':
  Eliminate mHasAlpha