Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Change-Id: I2310f914fb200db18ff4148d6f7fa9824fe2393e Reviewed-by: Bill King <bill.king@nokia.com>