Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp * commit 'edae848eb62e27b8e987aa89557d1456304fada7': Remove @LargeTest annotations
Merge commit 'edae848eb62e27b8e987aa89557d1456304fada7' into gingerbread-plus-aosp * commit 'edae848eb62e27b8e987aa89557d1456304fada7': Remove @LargeTest annotations