Mainline 'lk.lnx.1.0-dev.1.0' is merged into 'm-auto' to get latest changes on m-auto branch Change-Id: I9c75d3fbedd3b5c5fc9d1d675ae7984fe9f11a8f