resolved conflicts for merge of 978cc18d to honeycomb-mr1

Change-Id: Ic571fe4fda9d299b6b5d5e100b43fa8cc46e2ce6
tree: f8892c78c7190d078a943f15839fa7e0f55dd5f8
  1. tests/