Change-Id: Id9cf0094b6f9fa1cb8ee6f190541f6c681b77164
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>