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

Change-Id: Id53e3d9648060bbdecc5f1b67d4ac85183162740