Merge from open-source gingerbread

Change-Id: Ia24060add81186960781229089e8b3eee1390935
tree: 4148bc8d18fda85787593985f1f2466f4ba131d0
  1. tests/