Change-Id: I76a8727e12e3d19a2e2f5808080ee25b9af905c1 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
Change-Id: Ib82c1be5548443ef1f5e97b3d5641a2f55d212af Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Comes from original repo, with SHA1: 2c82d5611655e5967f5c5095af50c0991c4378b2