fix draw part 2

Change-Id: Ib508cf5fd75403e5a36168255bf3613526436428
6 files changed