Merge commit '1eda8628' into honeycomb-plus-aosp

Change-Id: I07948d5d76f4a25ae93ebd6c7ba0d520ef5b61c0