Merge commit 9082561 from lp:~cyruslien/pc-enablement/+git/oem-fix-misc-cnl-tlp-estar-conf
