Merge "ignore - a similar change already exists" into gingerbread-plus-aosp