Change-Id: Ia3f1e49aef203911bb5cf1ee062c9100be213b38 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2