am b643cbe5: (-s ours) am e0998604: Add necessary logic removed during backport

Merge commit 'b643cbe55852b01f1ab81da76d841b58d890276a'

* commit 'b643cbe55852b01f1ab81da76d841b58d890276a':
  Add necessary logic removed during backport