Change-Id: I4b694b0ba007ba7f7d6af37857fca57ceecdc4f0
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>