am d1398db3: Merge "Squashed commit of the following:" into gingerbread

Merge commit 'd1398db35cb2e4d918fc631dda35cacb8540b187' into gingerbread-plus-aosp

* commit 'd1398db35cb2e4d918fc631dda35cacb8540b187':
  Squashed commit of the following: