Change-Id: I7cba7d2d88459c26af31d89a2fd3cd31b6fbe62d
Reviewed-by: Lorenz Haas <lykurg@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>