am dd168c0a: Merge from gingerbread

* commit 'dd168c0afe58b87f67066e1f259fd3ed998a4d22':