am a4f593d7: am 576a0d14: Merge "Fix circular mask" into klp-modular-dev

* commit 'a4f593d7fb205b56412e3091fb21c592abe934cf':
  Fix circular mask