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

* commit 'd0711b42b757bcc4ffc2ad8a9989cf728d4bb034':
  use negative mask