1022

Change-Id: I36b8e616895ccaeaa1d886346ba18e27cef3c63a
Merge branch 'cm-10.2' into martincz