am d6e68c3a: Fix issue 2952766.

Merge commit 'd6e68c3ae5677bc6127628d1c700b11c8f0fcdaf' into gingerbread-plus-aosp

* commit 'd6e68c3ae5677bc6127628d1c700b11c8f0fcdaf':
  Fix issue 2952766.