It's r7 time!

Change-Id: I93b6c88e6008562e2f8b8c48552282611f1b446e
Signed-off-by: rebelos <ks50497@gmail.com>