am a26868d6: am 8907fc2a: am 4a5c1e1e: Fix 2209039 and 2220106

Merge commit 'a26868d6afffff8be91653da36cb4152ed68759a'

* commit 'a26868d6afffff8be91653da36cb4152ed68759a':
  Fix 2209039 and 2220106