am bbf00cfb: (-s ours) am 98f31087: Merge "DO NOT MERGE Fix bug 3026771, other design/asset fixes." into gingerbread

Merge commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4'

* commit 'bbf00cfbddb890bb35603bfca24e2e3bfab68ed4':
  DO NOT MERGE Fix bug 3026771, other design/asset fixes.