Merge "Remove unused Grid object from LabelMaker.java class." into gingerbread