Merge "Merge commit 'c3563eb9' into honeycomb-plus-aosp" into honeycomb-plus-aosp