This prevents the 'alpha-leak' reported in issue #220 Speed-diff is kept minimal. (cherry picked from commit c792d4129ab3500a59e271cadb5885d9f079de0b) Change-Id: I1976de5e6de7cfcec89a54df9233c1a6586a5846