Merge "Fix lshal cannot be run without root" am: 6481ebfbc3
am: 8d6362fc44

Change-Id: Id188e2657e393b0463c936435d2d8273bc3a80cf