Merge from gingerbread-plus-aosp

Change-Id: I0f4726870be5791e62f98fb45afd82b20f8ffba0