DO NOT MERGE.  We are now dev branch for Honeycomb MR2.

Change-Id: Icde20a70a35fc28e168eba4809c1c011ac5265b4
2 files changed