am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode...
am a1396dfe: am 02140891: Merge "Work on issue #4518815: Compatibility mode introduces compatibility regression..." into honeycomb-mr2
* commit 'a1396dfe':
Work on issue #4518815: Compatibility mode introduces compatibility regression...