Change-Id: I7d5aea306aeb3cd9109615f9ed4905c53125233a Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2