Rebasing Again to VIRGIN Vzw Kit_kat source

Signed-off-by: Bryan Smith <zarboz@gmail.com>