merge slimroms

Change-Id: I5e3a551a78bab44df0b779b801d86ccf10d20e94