Merge b7ea5aca to honeycomb-plus-aosp

Change-Id: I21074a6291cd8987f7e247c181fd02f8ad0f50d0