Merge "mainline lk.lnx.1.0 HEAD Commit: commit 7de805be Author: Anmolpreet Kaur <anmolpre@codeaurora.org> Date: Thu Feb 21 17:58:18 2019 +0530"