CRs-fixed: 335408 339193 (cherry picked from commit f24a8760d247e123f6c1bd24ee44ad4c604f4626) Conflicts: libhwcomposer/hwcomposer.cpp Change-Id: I9895e511e8d19fe3e58d3504afae399336afeb14
CRs-fixed: 335408 339193 (cherry picked from commit f24a8760d247e123f6c1bd24ee44ad4c604f4626) Conflicts: libhwcomposer/hwcomposer.cpp Change-Id: I9895e511e8d19fe3e58d3504afae399336afeb14