am ace15025: Merge "Follow up change of I8b38e280 (DO NOT MERGE)" into gingerbread

Merge commit 'ace15025c3ccc2bb351490836c01958dfd45ca34' into gingerbread-plus-aosp

* commit 'ace15025c3ccc2bb351490836c01958dfd45ca34':
  Follow up change of I8b38e280 (DO NOT MERGE)