squashed update for kk_mr2

Signed-off-by: Alin Jerpelea <alin.jerpelea@sonymobile.com>