Change-Id: I65da52375872552064ffa4fa9db8292d27f64f67
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>