am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0

* commit 'cc21cc017ba02338a78eca00af6a1a0d3f7ce5bf':
  Allow clearing out the source bounds