CRs-fixed: 343820 (cherry picked from commit 7ab561734ded4b52d5772584cc1369c7e3bedafa) Conflicts: libtilerenderer/tilerenderer.cpp Change-Id: Iafcd4035119bbb62a3ebcc5744279571fe9317ac
CRs-fixed: 343820 (cherry picked from commit 7ab561734ded4b52d5772584cc1369c7e3bedafa) Conflicts: libtilerenderer/tilerenderer.cpp Change-Id: Iafcd4035119bbb62a3ebcc5744279571fe9317ac