Merge 3100207b from gingerbread-plus-aosp

Change-Id: Ib2eaede8b9e400e1d273f981c08a6ef82f3dd588