am c4ddf36d: am b1e9a890: am cc379868: Merge "Ensure ripple mask gets updated in public constructor" into lmp-dev

* commit 'c4ddf36d0cc7f66770ef4fe3277de5aceaccccd9':
  Ensure ripple mask gets updated in public constructor