Merge commit '43f2b4e9c6811e0411446336ac4118565aa8eb88' into eclair-mr2-plus-aosp * commit '43f2b4e9c6811e0411446336ac4118565aa8eb88': Revert "Remove STOPSHIP comment."
Merge commit '43f2b4e9c6811e0411446336ac4118565aa8eb88' into eclair-mr2-plus-aosp * commit '43f2b4e9c6811e0411446336ac4118565aa8eb88': Revert "Remove STOPSHIP comment."