Merge commit '8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135' into eclair-plus-aosp * commit '8d1ff3a4c1df2e76e8f4ea9a4052e9b81f840135': Hide zoom api.