resolve merge of 8bf09b62 to gingerbread-plus-aosp

Change-Id: If94475b19837abf8f1ee427cf6f6da929cdcf105