Merge "use negative mask" am: 4e427f0aab
am: 469295f68e

* commit '469295f68e283977b0a5ff7e04a4413697f7eee7':
  use negative mask