Merge "Add lshal owners"
am: 732dd44f5f

Change-Id: I600de90d8b3ab9e2190ef37a3d13a0a595860be5