Merge "mainline lk.lnx.1.0 HEAD commit commit 0b84df2f Merge: 439bec66 1af05fdd Author: Linux Build Service Account <lnxbuild@localhost> Date: Wed Aug 1 11:26:11 2018 -0700"