Merge Derp : custom font size

Change-Id: Iab3927aa0711b82fb31c081d511cc33d9a05ec97