Merge commit '427c3a2177eb4d34c88406bb86107548737168cc' into honeycomb-release