Reconcile with gingerbread-release

Change-Id: I48801e3af5b90f6207f9468d3cabe8c3f7945b82
tree: 8dc8d433bb4f9062a6099e79bd87532a0fa446bb
  1. tests/