Change-Id: I97554a61d5f42bf46df30d003135d212fa353fb9
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>