am fcbe2c63: Fixing tests broken by jsharkey in CL https://android-git.corp.google.com/g/#change,29785

Merge commit 'fcbe2c631781d3a0fd05e9af4be8d9a92cf7cdb6' into eclair-mr2-plus-aosp

* commit 'fcbe2c631781d3a0fd05e9af4be8d9a92cf7cdb6':
  Fixing tests broken by jsharkey in CL https://android-git.corp.google.com/g/#change,29785