am 16657c9c: Merge "Fix test failures" into gingerbread

Merge commit '16657c9c201089d480feff0e8938ffbde3ffddde' into gingerbread-plus-aosp

* commit '16657c9c201089d480feff0e8938ffbde3ffddde':
  Fix test failures