Change-Id: I31e5f412ec2d4c371382e00503b7ebf5cc57ba02 Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Mostly, place one topic into one file. Change-Id: I8fdf43f14179816c0a57883068acd15b13a3761a Reviewed-by: Kai Koehne <kai.koehne@nokia.com>