Merge "Merge from gingerbread-plus-aosp"