Merge "(gingerbread) remove unused tests. bug:2898376" into gingerbread