Merge commit '8f76734d1e9a21618ad9762c0716ee93f60902ec' into eclair-plus-aosp * commit '8f76734d1e9a21618ad9762c0716ee93f60902ec': Fix docs breakage.