Cleanup and include some LG things from 2.6

Change-Id: Ie258c6efc00d7fcafa01e3d988fe6d0072d61117
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>