This reverts a change described in the above bug where the font size got changed to 22dip. Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939
This reverts a change described in the above bug where the font size got changed to 22dip. Change-Id: I42e2dc06e94aba003fa00032b265c986959ce939