Ununify d2

Change-Id: I17f480268e4290d490563f8d6ee457a05a5f27f5
Merge remote-tracking branch 'slimroms/lp5.0' into lp5.0