fix unit memory issue

Change-Id: I7729bb7c056e3c9d29ccc39a8a2de123127276d1
Merge topic 'fix_glyph_issue' into master

67cd96b3 fix unit memory issue