It's r7 time!

Change-Id: I939601da146869f23fa7632582e20e3d14e47826
Signed-off-by: rebelos <ks50497@gmail.com>
Merge remote-tracking branch 'slim/lp5.0-caf' into lp5.0-caf