Update headers from before 2011 that were missed in the previous commit. Change-Id: Ib0fd91a39ffc57117fe01280e34519c3f914fac0 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
It should be separated at some point. Change-Id: I03adde303eed558d52e06f0afa673252e54c2182 Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>