Merge from honeycomb-plus-aosp

Change-Id: I66f5d4f8b703789a02f7e137235e9321fc413f5d