Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp * commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7': DO NOT MERGE