Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp * commit '02486b1327e3007c62d253dd89ba9db1852b87f8': Hide heavy-weight API.
Merge commit '02486b1327e3007c62d253dd89ba9db1852b87f8' into gingerbread-plus-aosp * commit '02486b1327e3007c62d253dd89ba9db1852b87f8': Hide heavy-weight API.