am 10d32a33: Merge change I16dc1411 into eclair-mr2

Merge commit '10d32a338d5400786e784a0d6f51b53acea76b44' into eclair-mr2-plus-aosp

* commit '10d32a338d5400786e784a0d6f51b53acea76b44':
  add boundary patch