Merge commit '10d32a338d5400786e784a0d6f51b53acea76b44' into eclair-mr2-plus-aosp * commit '10d32a338d5400786e784a0d6f51b53acea76b44': add boundary patch
Merge commit '10d32a338d5400786e784a0d6f51b53acea76b44' into eclair-mr2-plus-aosp * commit '10d32a338d5400786e784a0d6f51b53acea76b44': add boundary patch